From 1cf6a85aab8aa987b55699ed7f677efdb9f9177e Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Sun, 17 Feb 2008 22:28:55 +0000 Subject: [PATCH] When converting a stock item based on the label, remove the label 2008-02-17 Johan Dahlin * gtk/gtk-builder-convert (GtkBuilderConverter._add_action_from_menuitem): When converting a stock item based on the label, remove the label property. (bug #515824, Yuri Pimenov) svn path=/trunk/; revision=19607 --- ChangeLog | 5 +++++ gtk/gtk-builder-convert | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index dee6725240..3a04260321 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-02-17 Johan Dahlin + + * gtk/gtk-builder-convert (GtkBuilderConverter._add_action_from_menuitem): + When converting a stock item based on the label, remove the label property. + 2008-02-17 Richard Hult * gdk/quartz/GdkQuartzWindow.c: (showAndMakeKey): Update the diff --git a/gtk/gtk-builder-convert b/gtk/gtk-builder-convert index 689c96593e..088637f2e2 100755 --- a/gtk/gtk-builder-convert +++ b/gtk/gtk-builder-convert @@ -421,15 +421,14 @@ class GtkBuilderConverter(object): raise NotImplementedError(object_class) if get_property(node, 'use_stock') == 'True': - child = get_property_node(node, 'label') - if child: + if 'label' in properties: properties['stock_id'] = child + del properties['label'] properties['name'] = object_id action = self._create_object(name, object_id, properties=properties) - for signal in get_signal_nodes(node): signal_name = signal.getAttribute('name') if signal_name in ['activate', 'toggled']: -- 2.30.2